Capability Maps - The Next Generation